-
-
Notifications
You must be signed in to change notification settings - Fork 612
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix missing via
s when more than two input files are used
#1890
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
daveboutcher
approved these changes
Jun 26, 2023
AndydeCleyre
force-pushed
the
fix-jazzband-1853
branch
from
June 26, 2023 18:48
d3c8f0f
to
7ae780f
Compare
atugushev
reviewed
Jun 28, 2023
atugushev
approved these changes
Jun 28, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Otherwise, great work! Thanks for the fix 🎉
Co-authored-by: Albert Tugushev <albert@tugushev.ru>
@atugushev I see this just missed inclusion in 6.14.0 -- any chance of a 6.14.1 to release this sooner rather than later? And thanks for your review 🙂 |
@lpulley unfortunately no. The next release will be 7.0.0. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1853.
The gist of the problem is that
only kept the last
ireq
for each key, rather than combining them (and thus their sources).There are two changes here:
self._constraints_map
is no longer constructed directly fromconstraints
; rather, the items inconstraints
are first grouped by key into sets, then those sets are "collapsed" viacombine_install_requirements()
into singleInstallRequirement
s.pinned_ireq._source_ireqs
is no longer always a singleton list of the value fromself._constraints_map
; rather, if the constraint has_source_ireqs
, then that list is used aspinned_ireq._source_ireqs
. This effectively "unwraps"_source_ireqs
(once) if possible.writer.py
recurse on_source_ireqs
when constructingrequired_by
, but that touches more code paths than are necessary to fix this, so I opted for this solution instead. Such recursion would enable combinedInstallRequirement
s to be combined further without issue, but that doesn't seem to be a requirement right now.The new
test_many_inputs_includes_all_annotations
is parametrized for 2, 3, and 10 inputs; the 2 case was not broken but should still be tested.Contributor checklist
Maintainer checklist
backwards incompatible
,feature
,enhancement
,deprecation
,bug
,dependency
,docs
orskip-changelog
as they determine changelog listing.